Fix warnings about non-const sprintf formatters.

diff --git a/csv_util.c b/csv_util.c
index 66ed7ad6e7cd41a6103ff6d6431ced536b87866d..1eaea9548ed4f99ffa05b412af0cc94309e1bd78 100644 (file)
--- a/csv_util.c
+++ b/csv_util.c
@@ -654,7 +654,7 @@ dec_to_human( char *buff, const char *format, const char *dirs, double val )
                    index++;
                    break;
                case '%':
-                   sprintf( buff+strlen(buff), subformat );
+                   sprintf( buff+strlen(buff), "%s", subformat );
                    break;
                default:
                    fatal(MYNAME ": invalid format specifier\n");
@@ -663,7 +663,7 @@ dec_to_human( char *buff, const char *format, const char *dirs, double val )
            }
        }
        else {
-           sprintf( buff+strlen(buff), subformat );
+           sprintf( buff+strlen(buff), "%s", subformat );
        }
        formatptr += strlen(subformat);
     } 

diff --git a/gopal.c b/gopal.c
index b4786c224fdf5a53f1fd6af70bea7729f94a31d8..7e1eeded7f9e7a80d318d5bafa969972c12460b3 100644 (file)
--- a/gopal.c
+++ b/gopal.c
@@ -92,7 +92,7 @@ int gopal_check_line(char *line)
        if (i != 8)
        {
                snprintf(tmp,sizeof(tmp),"\"%s\"\n",line);
-               fprintf(stderr,tmp);
+               fprintf(stderr,"%s",tmp);
        }
        return i;
 }

diff --git a/pathaway.c b/pathaway.c
index d8327e2097fe22246d77560a885f417eb29bb34a..2e76618174285bbef811ccf54959d3868aa84cc0 100644 (file)
--- a/pathaway.c
+++ b/pathaway.c
@@ -638,7 +638,7 @@ static void ppdb_write_wpt(const waypoint *wpt)
        if (fabs(wpt->altitude) < 9999.0)       
        {
            tmp = str_pool_get(32);
-           snprintf(tmp, 32, ppdb_fmt_float(METERS_TO_FEET(wpt->altitude)));
+           snprintf(tmp, 32, "%s", ppdb_fmt_float(METERS_TO_FEET(wpt->altitude)));
            buff = ppdb_strcat(buff, tmp, NULL, &len);
        }
        buff = ppdb_strcat(buff, ",", NULL, &len);

diff --git a/shape.c b/shape.c
index 10954123870f4d03423a7e30642b8e842af4d84e..9f36e0a978d107d4e5e6d01350c46b689b275b78 100644 (file)
--- a/shape.c
+++ b/shape.c
@@ -75,7 +75,7 @@ my_rd_init(const char *fname)
                                txt = xstrappend( txt, txtName  );
                        }
                        txt = xstrappend( txt,  "\n" );
-                       fatal( txt );
+                       fatal("%s",  txt);
                }
                if ( strchr(opt_name, '+')) {
                        nameidx = -2;

diff --git a/xmldoc/formats/delbin.xml b/xmldoc/formats/delbin.xml
index 3b7280f1cd5ab3003c4bda775e8f9ddd9140b955..83909bcab67a0a8f4cfd923b4e67435785a13f8e 100644 (file)
--- a/xmldoc/formats/delbin.xml
+++ b/xmldoc/formats/delbin.xml
@@ -1,5 +1,5 @@
 <para>
-  The 'delbin' module supports DeLorme PN-20, PN-30, and PN-40 receivers.
+  The 'delbin' module supports DeLorme PN-20, PN-30, PN-40, and PN-40 SE receivers.
   <important>
     <para>
       Not all strains of Linux are supported.   Fedora 7 is known not to work, for example.
@@ -31,3 +31,8 @@
     </userinput>
   </para>
 </example>
+<<<<<<< delbin.xml
+
+
+=======
+>>>>>>> 1.3